[cxx-interop] Fix a rare compilation error in reverse interop header #80598
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Xazax-hun
requested review from
zoecarver,
egorzhdan,
j-hui,
fahadnayyar,
susmonteiro,
hnrklssn,
beccadax and
ian-twilightcoder
as code owners
egorzhdan
approved these changes
Apr 7, 2025
lib/ClangImporter/ClangImporter.cpp
Outdated
|
|
||
| bool importer::isClangNamespace(const DeclContext *dc) { | ||
| if (const auto *ed = dc->getSelfEnumDecl()) | ||
| return llvm::isa_and_nonnull<clang::NamespaceDecl>(ed->getClangDecl()); |
ADKaster
reviewed
Apr 7, 2025
| // RUN: cat %t/UseCxxTy.h >> %t/full-header.h | ||
| // RUN: %target-interop-build-clangxx -std=c++20 -c -xc++-header %t/full-header.h -o %t/o.o | ||
|
|
||
| // UN: %FileCheck %s < %t/UseCxxTy.h |
There was a problem hiding this comment.
Is this UN: supposed to be RUN:?
There was a problem hiding this comment.
Whoops, this is a line I wanted to remove. Thanks for catching this!
To trigger this error one needs to import a nested type from C++, use it in a generic context in Swift, and export it back to C++. We were inconsisent in what namespace did we declare the functions to get the type metadata for types. It was in the swift namespace for foreign types and in the module namespace for Swift types. This PR standardizes on how the metadata function is declared and called to fix the issue. Fixes #80538. rdar://148597079
Xazax-hun
force-pushed
the
gaborh/nested-foreign-type-metadata
branch
from
36aaa67 to
b3b2031
Compare
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To trigger this error one needs to import a nested type from C++, use it in a generic context in Swift, and export it back to C++. We were inconsisent in what namespace did we declare the functions to get the type metadata for types. It was in the swift namespace for foreign types and in the module namespace for Swift types. This PR standardizes on how the metadata function is declared and called to fix the issue.
Fixes #80538.
rdar://148597079